Revert "Deprecate gtk_icon_theme_add_builtin_icon"

This reverts commit 923eeda2d3cae13d02b0a9d2e5774b12eed999e0.

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 203c1674a2cd37b8405546432b9bc787e5134b4d..c23b300dc3a701d08dce9192c5faaad5f78c0b96 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3542,8 +3542,6 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
  *     The returned image must not be modified.
  *
  * Since: 2.4
- *
- * Deprecated: 3.14: This function is deprecated.
  */
 GdkPixbuf *
 gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info)
@@ -4991,9 +4989,6 @@ gtk_icon_info_get_display_name (GtkIconInfo *icon_info)
  * via gdk_pixbuf_new_from_inline().
  *
  * Since: 2.4
- *
- * Deprecated: 3.14: Use gtk_icon_theme_add_resource_path() to add
- *     application-specific icons to the icon theme.
  */
 void
 gtk_icon_theme_add_builtin_icon (const gchar *icon_name,

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index e697731252ff72b1f62bd7ea6c9437b92f665175..e37a52dd9d6335876cb680b52f8f5d937cf97213 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -270,7 +270,7 @@ char *        gtk_icon_theme_get_example_icon_name (GtkIconTheme
 GDK_AVAILABLE_IN_ALL
 gboolean      gtk_icon_theme_rescan_if_needed      (GtkIconTheme                *icon_theme);
 
-GDK_DEPRECATED_IN_3_14_FOR(gtk_icon_theme_add_builtin_icon)
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_add_builtin_icon      (const gchar *icon_name,
                                                    gint         size,
                                                    GdkPixbuf   *pixbuf);
@@ -292,7 +292,7 @@ GDK_AVAILABLE_IN_3_10
 gint                  gtk_icon_info_get_base_scale     (GtkIconInfo   *icon_info);
 GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
-GDK_DEPRECATED_IN_3_14
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_icon_info_get_builtin_pixbuf (GtkIconInfo   *icon_info);
 GDK_AVAILABLE_IN_3_12
 gboolean              gtk_icon_info_is_symbolic        (GtkIconInfo   *icon_info);